Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Thu, 23 Mar 2017 16:19:07 +0000 (12:19 -0400)
committerTom Rini <[email protected]>
Thu, 23 Mar 2017 16:19:07 +0000 (12:19 -0400)

Trivial merge